Merge branch 'master' of jgoerzen.
authorBernd Zeimetz <bernd@bzed.de>
Sat, 27 Dec 2008 00:52:30 +0000 (01:52 +0100)
committerBernd Zeimetz <bernd@bzed.de>
Sat, 27 Dec 2008 00:52:30 +0000 (01:52 +0100)
commit7833d7f0bdfdef7b56d63a3d2199e852e8a95831
tree7c4e42b448b48a5c5b38b14a14686a497c8f7a7d
parent5d5b3d9194801f6a68055430a12173bda3fd4bf6
parent395217929a9452b58e61ed028de5f6f73bb4b5ef
Merge branch 'master' of jgoerzen.

git://git.debian.org/git/users/jgoerzen/gpsbabel

Conflicts:

coastexp.c
debian/changelog
debian/control
debian/rules
psitrex.c
reference/coastexp.nob
reference/coastexp.ref
reference/expertgps.gpx
reference/foo.an1
uuid.c
uuid.h
vtesto